From deb3d9e5064d6cedd6f1307087665b0be9219920 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Sat, 28 Feb 2004 04:27:23 +0000 Subject: [PATCH] remove conflict marker --- ChangeLog | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-4 | 1 - ChangeLog.pre-2-6 | 1 - ChangeLog.pre-2-8 | 1 - 5 files changed, 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a68c89a90a..5f4d8d0147 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,7 +44,6 @@ Fri Feb 27 18:46:27 2004 Jonathan Blandford For now, use gtk_file_system_insert_bookmark() with -1 for the position. DnD will come next. ->>>>>>> 1.5045 Fri Feb 27 21:42:28 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_relayout): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a68c89a90a..5f4d8d0147 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -44,7 +44,6 @@ Fri Feb 27 18:46:27 2004 Jonathan Blandford For now, use gtk_file_system_insert_bookmark() with -1 for the position. DnD will come next. ->>>>>>> 1.5045 Fri Feb 27 21:42:28 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_relayout): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a68c89a90a..5f4d8d0147 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -44,7 +44,6 @@ Fri Feb 27 18:46:27 2004 Jonathan Blandford For now, use gtk_file_system_insert_bookmark() with -1 for the position. DnD will come next. ->>>>>>> 1.5045 Fri Feb 27 21:42:28 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_relayout): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a68c89a90a..5f4d8d0147 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -44,7 +44,6 @@ Fri Feb 27 18:46:27 2004 Jonathan Blandford For now, use gtk_file_system_insert_bookmark() with -1 for the position. DnD will come next. ->>>>>>> 1.5045 Fri Feb 27 21:42:28 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_relayout): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a68c89a90a..5f4d8d0147 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -44,7 +44,6 @@ Fri Feb 27 18:46:27 2004 Jonathan Blandford For now, use gtk_file_system_insert_bookmark() with -1 for the position. DnD will come next. ->>>>>>> 1.5045 Fri Feb 27 21:42:28 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_relayout): -- 2.30.2